Fix NoAccessLevelOnExtensionDeclaration to update members inside #if blocks.
#969
Conversation
allevato
force-pushed
the
extension-access
branch
2 times, most recently
from
38ee56c to
7020673
Compare
Ugh, yeah, you're right. Do you have a preference for how you'd like them handled? We could manage the stack and do the same thing for nested extensions that we would for top-level ones, or we could just ignore nested extensions because they're obviously broken. |
|
I would just not walk into nested extensions. Leaving them as-is is probably the best thing we can do. |
…if` blocks. Fixes swiftlang#966.
allevato
force-pushed
the
extension-access
branch
from
7020673 to
d708582
Compare
Updated. Instead of using a simple |
| public override func visit(_ node: ActorDeclSyntax) -> DeclSyntax { | ||
| return applyingAccessModifierIfNone(to: node) | ||
| } |
There was a problem hiding this comment.
Instead of overriding all these functions, would it make sense to add a visitAny and call applyingAccessModifierIfNone from there?
There was a problem hiding this comment.
I just gave that a go and I think it ended up harder to follow. visitAny would have to do a check like "if the node isn't a decl, or if it's an ExtensionDecl or IfConfigDecl, return nil to allow the regular traversal", and it would also have to first call the super implementation because that's where we check if there's an applicable swift-format-ignore directive.
I think it's cleaner to just explicitly list out the decls we care about, even though it means having them listed in two places.
There was a problem hiding this comment.
OK, I thought that visitAny would have just checked if the node conforms to WithModifierSyntax. But maybe it’s not as easy as that.
Fixes #966.
This rewrites the rule entirely to take advantage of the natural recursion of visiting the extension's children instead of trying to rewrite and replace the member list at the extension level.
I've tended to avoid the idea of writing stateful format rules like this, because pushing state down from a node to its children would normally require maintaining a stack of information. But in this case, the problem is a lot simpler because extensions can't be nested, so there's never more than one level of state to track.